ChangeLog merge fixes
authorGlenn Morris <rgm@gnu.org>
Mon, 14 May 2012 16:11:24 +0000 (09:11 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 14 May 2012 16:11:24 +0000 (09:11 -0700)
commit59e636cf75627dd1e086f2ea5bf7be5fcbeef8b7
tree90b94d923eeeadd8c567cfe7ec671b8a5e5f9c68
parent6ec65287ac4b2d23411b3fb43c9ec632e22fb4e4
ChangeLog merge fixes
doc/misc/ChangeLog
lisp/ChangeLog